Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Dec 2011 11:11:54 +0000 (03:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Dec 2011 11:11:54 +0000 (03:11 -0800)
commitec6d364cb07c97cc076cb06ebda94d96b3486841
tree8c48388df482912c7341e4e06aa1b92ccdcf9a64
parentfb3e9878fa95f42b55be7d3a029e8ee30c41b4fc
parent051f6f4ead1edc92a2a0114a9cd8a249ea63f9ff
Merge from trunk.